More include shuffling; keep X extension headers to ourselves

diff --git a/gdk/x11/gdkdevice-xi2.c b/gdk/x11/gdkdevice-xi2.c
index 53367fd47d084dda4e291429297a5398d6bdbeca..78b9de693a5c4a3f0cfe8e35be2a00271d20c88a 100644 (file)
--- a/gdk/x11/gdkdevice-xi2.c
+++ b/gdk/x11/gdkdevice-xi2.c
@@ -26,6 +26,10 @@
 #include "gdkasync.h"
 #include "gdkprivate-x11.h"
 
+#include <X11/Xlib.h>
+#include <X11/Xutil.h>
+#include <X11/extensions/XInput2.h>
+
 struct _GdkX11DeviceXI2
 {
   GdkDevice parent_instance;

diff --git a/gdk/x11/gdkdevicemanager-xi2.c b/gdk/x11/gdkdevicemanager-xi2.c
index 83ab51c6fe04f6057b8199c3b279085c0ff1cbf6..465099f577ef141211dcc839bdf9fb97a147ceac 100644 (file)
--- a/gdk/x11/gdkdevicemanager-xi2.c
+++ b/gdk/x11/gdkdevicemanager-xi2.c
@@ -30,6 +30,10 @@
 #include "gdkintl.h"
 #include "gdkkeysyms.h"
 
+#include <X11/Xlib.h>
+#include <X11/Xutil.h>
+#include <X11/extensions/XInput2.h>
+
 #include <string.h>
 
 struct _GdkX11DeviceManagerXI2

diff --git a/gdk/x11/gdkdeviceprivate-xi.h b/gdk/x11/gdkdeviceprivate-xi.h
index b94ec47f6e0ce473449df9c937d21ed447fad2b1..05df1ee5ab9b06df6205840361e5050991865830 100644 (file)
--- a/gdk/x11/gdkdeviceprivate-xi.h
+++ b/gdk/x11/gdkdeviceprivate-xi.h
@@ -23,6 +23,10 @@
 #include "gdkx11device-xi.h"
 #include "gdkdeviceprivate.h"
 
+#include <X11/Xlib.h>
+#include <X11/Xutil.h>
+#include <X11/extensions/XInput.h>
+
 G_BEGIN_DECLS
 
 struct _GdkX11DeviceXI

diff --git a/gdk/x11/gdkprivate-x11.h b/gdk/x11/gdkprivate-x11.h
index fa134c72c0c32492e1cb416ea22eeb0299b02515..d4114c9108358a71f7dcb30bb0726a1eb30ae355 100644 (file)
--- a/gdk/x11/gdkprivate-x11.h
+++ b/gdk/x11/gdkprivate-x11.h
@@ -38,6 +38,12 @@
 #include "gdkwindow-x11.h"
 #include "gdkscreen-x11.h"
 #include "gdkdisplay-x11.h"
+
+#include <X11/Xlib.h>
+#include <X11/Xutil.h>
+#include <X11/extensions/XInput.h>
+#include <X11/extensions/XInput2.h>
+
 #include <cairo-xlib.h>
 
 void _gdk_x11_error_handler_push (void);

diff --git a/gdk/x11/gdkx11device-xi.h b/gdk/x11/gdkx11device-xi.h
index 061f8dfcdd95511a690553e2b6c72b0d360b4b4a..65e5295622921845fa12c65a037bc67131bc1459 100644 (file)
--- a/gdk/x11/gdkx11device-xi.h
+++ b/gdk/x11/gdkx11device-xi.h
@@ -22,8 +22,6 @@
 
 #include <gdk/gdk.h>
 
-#include <X11/extensions/XInput.h>
-
 G_BEGIN_DECLS
 
 #define GDK_TYPE_X11_DEVICE_XI         (gdk_x11_device_xi_get_type ())

diff --git a/gdk/x11/gdkx11device-xi2.h b/gdk/x11/gdkx11device-xi2.h
index 85fe78871429e2cbdcf6638af5f006dc62ec71f8..15f7db6a8063248d9a14043ceb05512c93111c03 100644 (file)
--- a/gdk/x11/gdkx11device-xi2.h
+++ b/gdk/x11/gdkx11device-xi2.h
@@ -22,8 +22,6 @@
 
 #include <gdk/gdk.h>
 
-#include <X11/extensions/XInput2.h>
-
 G_BEGIN_DECLS
 
 #define GDK_TYPE_X11_DEVICE_XI2         (gdk_x11_device_xi2_get_type ())

diff --git a/gdk/x11/gdkx11devicemanager-xi2.h b/gdk/x11/gdkx11devicemanager-xi2.h
index 38c351b59823c5f111e8b0248bebd05d960f7ca5..acae52bc625df9602ffa709969db6791d23705ba 100644 (file)
--- a/gdk/x11/gdkx11devicemanager-xi2.h
+++ b/gdk/x11/gdkx11devicemanager-xi2.h
@@ -22,8 +22,6 @@
 
 #include <gdk/gdk.h>
 
-#include <X11/extensions/XInput2.h>
-
 G_BEGIN_DECLS
 
 #define GDK_TYPE_X11_DEVICE_MANAGER_XI2         (gdk_x11_device_manager_xi2_get_type ())